* cl-lib.el (buffer-string): Simplify last change.

Fixes: debbugs:12293

diff --git a/lisp/emacs-lisp/cl-lib.el b/lisp/emacs-lisp/cl-lib.el
index 7239b5bd8ca6caa500f46f6792dc45beb471e5a5..532c81c502c11920d2a239d9b8b32468d41c65ee 100644 (file)
--- a/lisp/emacs-lisp/cl-lib.el
+++ b/lisp/emacs-lisp/cl-lib.el
@@ -635,8 +635,7 @@ If ALIST is non-nil, the new pairs are prepended to it."
      (set-buffer-modified-p ,flag)))
 (gv-define-simple-setter buffer-name rename-buffer t)
 (gv-define-setter buffer-string (store)
-  ;; Eval `store' first since it may look at the buffer.
-  (macroexp-let2 nil s store `(progn (erase-buffer) (insert ,s))))
+  `(insert (prog1 ,store (erase-buffer))))
 (gv-define-simple-setter buffer-substring cl--set-buffer-substring)
 (gv-define-simple-setter current-buffer set-buffer)
 (gv-define-simple-setter current-case-table set-case-table)